Merge pull request #17 from MySmallfish/master

1.1.0
Merge pull request #20 from michaelblayfer/master

Merge pull request #17 from MySmallfish/master