Updated to 2.0
Fixed version
Merge branch 'develop'