Tested on all classes
Merge pull request #1 from Crowdedlight/master

Merging to development