refactored for version 2.0
Version bumped from 1.0.0 to 2.0
Merge branch 'release-2.0'