Bump Version
Merge branch 'develop' into feature/test-suite