Fixed issue #57
Merge pull request #58 from jcrudy/issue57

Fixed issue #57