Pull request for issue #225