Getting ready for 2.0
Merge branch 'develop'