Pull request for issue #25