Merge pull request #758 from Matoking/master