Upgrade to 2.0.0-SNAPSHOT
Merge pull request #1 from slandelle/master

Upgrade to 2.0.0-SNAPSHOT