Merge pull request #776 from aTanW/master