Version 1.0 bumped
Merge branch 'develop'