Merge pull request #1 from behumble/master

Sync Fork with parent repo