Merge pull request #8 from CS2014/ross

Ross
Merge branch 'master' of https://github.com/CS2014/USM into ross