Merge pull request #2 from MySmallfish/master

upgrading to 1.0.7
Merge pull request #3 from michaelblayfer/master

Merge pull request #2 from MySmallfish/master