pull request for #57