Merge pull request #1 from Seist/master

Merging my master branch into the main repo