bump version to 2.1
Merge pull request #415 from gasche/master

bump version to 2.1