Merge pull request #12 from mfrancis95/master

Pulled from master
Merge pull request #13 from mfrancis95/nelson

Merge pull request #12 from mfrancis95/master