Update to version 2.1.0
Merge pull request #24 from studer/patch-2

Update to version 2.1.0
Closes issue #24