Class fixes and better handling of the columns
Merge pull request #2 from lipis/class-fixes

Class fixes and better handling of the columns