Changes from code review.
Merge pull request #61 from SHeimlich/master

Changes from code review added to this folder.