Hack Day Goodness!
hadn't pulled from upstream in awhile
Merge pull request #17 from StoicJester/master

Hack Day Goodness!