Same as pull request #15, but now for the develop branch