Merge pull request from LinZap/master