Prepared for 2.0.1 update.
Updated documentation.
Merge branch 'develop'
Merge branch 'master' into release