Merge pull request #958 from aTanW/master