Merge pull request #861 from ynezz/master