merge pull request from haosdent