Merge pull request from velocitan/master