Merge pull request #14 from MySmallfish/master

1.0.45