issue #10, adding support for subclasses
Merge remote-tracking branch 'origin/master'