Merge pull request #1 from corydissinger/master

rebasing