Merge pull request #30 from mfrancis95/ross

Ross
Merge branch 'master' into ross