Merge branch 'master' of github.com:wandoulabs/wandou-avpath

Conflicts:
	README.md
Merge branch 'master' of github.com:wandoulabs/wandou-avpath