Merge pull request #1 from dodgepudding/master

merge from dodgepudding