Merge branch 'master' into develop
Use 2.0.0.0 as the assembly version to avoid versioning issues
Release 3.0.1