Resulting code from group code review.
Merge pull request #1 from wbyoung/group-code-review

Resulting code from group code review.