fixed based on feedback
Merge pull request #11 from mhansbury/master

fixed based on feedback