Merge pull request #55 from suntinghui/master

lj