Merge pull request #1 from CumbersomeFugly/master

Merging.
Merge pull request #3 from rogueSnake/master

Merge pull request #1 from CumbersomeFugly/master