Merge pull request #5 from MySmallfish/master

1.0.11