Merge pull request #340 from Zhangxinguo/master

Add back missing mereged codes.