Fixes issue #98
Merge pull request #99 from jproffitt/issue_98

Fixes issue #98