Corrects a few problems pointed out in the Code Review.
Merge pull request #7 from artfullyContrived/issue56

Corrects a few problems pointed out in the Code Review.