Merge pull request #2 from Tmee/master

Merge pull request #1 from AdamSmith910/master