Merge pull request #1 from Mooophy/master

141116from mooophy