Changed stuff
Merge pull request #2 from NanProgram/Matthew

Changed stuff