Merge pull request #678 from kaizhang/master