Updates for review feedback
Updates for review feedback
Merge pull request #16 from lanafrost/master

Updates to incorporate review feedback