Migrate to 2.0
Merge pull request #1 from maxbaeumle/master

Migrate to 2.0