Pull request for issue #32

Fixes #32. Generated by conveyor-workflow.