Merge pull request #2 from xspider/master

sync master
complete sample
modify sample
Merge pull request #6 from miller/master

complete router