Merge pull request #1 from ChrisBoesch/master

update
Merge pull request #2 from ChrisBoesch/master

update
continue path functional now
Merge pull request #3 from ruijunhuang2010/master

update