lj

Merge pull request #60 from suntinghui/master