Merge pull request #4 from MentatMinions/master

syncing
Merge pull request #13 from Saphrym/master

Merge pull request #4 from MentatMinions/master