Merge pull request #30 from samwilliams312/master

background