Merge pull request #9 from codefellows/master

Merge pull request #5 from dcorns/master
Merge pull request #7 from dcorns/master

Merge pull request #9 from codefellows/master