First pass for issue #59
Merge pull request #776 from an/patch-1

First pass for issue #59