STH
Merge pull request #5 from liaojia/master

pull
Merge pull request #4 from suntinghui/master

ljj