Merge pull request #76 from heyongjian/master

pull