Merge pull request #1 from dwotherspoon/master

Fix your stuff.