Merge pull request #31 from sambohler/master

v2.0.0