Merge branch 'release/v0.1.2'
Improved class grouping
Merge branch 'release/v0.1.3'
Merge branch 'release/v0.1.4'
fix issue with multiple files
fix issue with multiple files
Merge branch 'release/v0.1.5' into develop