Matej Kurpel - 2010-01-03

Improved class file