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