Merge pull request #1 from shaneutt/master

lol