Merge tag '2.0' into develop

Version 2.0
Updated version number
Merge branch 'release/2.0.1'