Merge pull request #638 from directhex/master