Merge branch 'master' into working
Fix #29
Add new tests for classes
Merge branch 'working'
Merge remote-tracking branch 'upstream/master'