merged in pull request from @rivimey