Merge pull request #1 from panlilu/master

some improvement