Merge pull request #2 from kurtstohrer/master

Updating my copy
Merge pull request #4 from Argzero/master

Merge pull request #2 from kurtstohrer/master