Merge pull request #301 from directhex/master