Merge pull request #1 from CumbersomeFugly/master

Merging.