Merge pull request #5 from Yardley999/master

merge