merged pull request from @pjvds