Updated w/ feedback from internal review
Merge pull request #27 from nhr/master

Updated w/ feedback from internal review