Pull request for issue 54