Upgrade to 2.0.0
Merge branch 'version-two'