Merge pull request #2 from Yardley999/master

pull request from master