Improved class grouping
minor change
Merge branch 'release/v0.1.3'