adds some more classes in the framework
Merge remote-tracking branch 'origin/master'