Merge pull request #2 from MySmallfish/master

upgrading to 1.0.7