Merge pull request #1 from MentatMinions/master

Merge pull request #7 from Saphrym/master
Merge pull request #8 from Saphrym/master

Merge pull request #1 from MentatMinions/master