Merge pull request #1 from samwilliams312/master

soFJ