Stable Version 2.0.0
Merge branch 'develop'