Merge pull request #2 from gmuteam/master

sync master
Merge pull request #3 from gmuteam/master

sync master
Merge pull request #4 from gmuteam/master

sync master
Merge pull request #5 from gmuteam/master

sync master
增加error/file/queue等，已加入demo
Merge pull request #15 from miller/master

增加file/error/queue，以及完善DEMO