Merge pull request #39 from mfrancis95/ross

Bunch of shtuff.
Merge branch 'master' into ross