Fixing class warnings
Merge pull request #50 from hfossli/class-warnings

Fixing class warnings