Merge pull request #2 from CS2014/ross

Ross
Merge branch 'master' into ross