Update version to 2.1
Merge pull request #96 from sdeleuze/master

Update version to 2.1