Fix #97 merge proposed fix, add test case.
Merge pull request #103 from brettwooldridge/Bug#97

Fix #97 merge proposed fix, add test case.