Issue #21 Changes to adapt for @joekiller request
Merge branch 'renaming_classes'