Merge pull request #40 from lwanghaol/master

Merge pull request #19 from heyongjian/master
Merge pull request #41 from lwanghaol/master

wanghao:joyfolder accept the network info and display
Merge pull request #20 from heyongjian/master

merger