Merging latest commit

Latest commit literally "Merge pull request #5 from mcrocks999/master"