Merge pull request #56 from suntinghui/master

lj