Merge pull request #52 from plug-and-pay/version/1.0.7

Merge pull request #52 from plug-and-pay/version/1.0.7 #258