Merge pull request #1235 from directhex/master