Merge pull request #5 from samwilliams312/master

pull request 1