Fixed major oversight from class rewrite
Merge pull request #21 from birjolaxew/master

Fixed major oversight from class rewrite