Merge pull request #33 from heyongjian/master

merge pull request
optimize for joyfolder
Merge pull request #84 from lwanghaol/master

optimize for joyfolder