First pass for issue #25
Merge pull request #799 from an/patch-1

First pass for issue #25