merged pull request from bbugguj