merged pull request from rstudner