Normalizing PR #129.
Closes #129 PR from Josh.