Merge pull request #12 from mfrancis95/master

Pulled from master