Pull request for issue #72