Issue #62. Fix.
Merge pull request #63 from jam231/issue62

Issue #62. Fix.