Update to version 1.1

Update to version 1.1
Merge pull request #2 from jslegers/master

Update to version 1.1