Merge pull request #2 from Yardley999/master

pull request from master
Merge pull request #7 from Yardley888/patch-1

Merge pull request #2 from Yardley999/master