Merge pull request #16 from mjohnson541/mjohnson541-master

Merge pull request #15 from mjohnson541/master
Merge pull request #19 from mjohnson541/master

Merge pull request #16 from mjohnson541/mjohnson541-master