merging pull request from diemuzi