Update with feedback
Merge pull request #4 from hLittle/update-with-feedback

Update with feedback