Pull request for #234