manually merged pull request in #3