Merge pull request #614 from directhex/master