dhowe Merge pull request #1386 from cqx931/master …