Merge pull request #1 from kurtstohrer/master

Self-update
Merge pull request #2 from Argzero/master

Merge pull request #1 from kurtstohrer/master