Update to v1.1
Merge pull request #337 from madd15/patch-1

Update to v1.1