Merge pull request #17 from MySmallfish/master

1.1.0