Jeremy's commit
Trying to commit from LINUX
Merge pull request #9 from foolio97/master

Win7 + LINUX Commit