1.0.8
Merge branch 'feature/1.0.8' into develop