Merge pull request #1 from Seist/master

Merging my master branch into the main repo
Merge pull request #28 from Decagon/master

Merge pull request #1 from Seist/master