1.0.6
Merge branch 'feature/1.0.6' into develop