Merge branch 'develop'
Bump version 2.0 -> 2.1