Cleaning more dev stuff
Version bump
Merge branch 'version-2.0'