Merge branch 'release/0.5.2' into develop
fixed classmap
bumped version
Merge branch 'release/0.5.3'