Update to version 2.1.0
Merge pull request #23 from studer/patch-1

Update to version 2.1.0
Closes issue #23