Merge pull request #801 from Ninds/master