Pull request for issue #24

Fixes #24. Generated by git-convey.