Pull request for issue #27

Fixes #27. Generated by git-convey.