Pull request for issue #63