Merge pull request #1 from 4thjuly/Merge2

Stuff