2.0 release
Merge pull request #239 from wmde/20

2.0 release