Merge pull request #2 from 4thjuly/master

Stuff
Merge pull request #3 from 4thjuly/TempMerge

Merge pull request #2 from 4thjuly/master