shorten buddy timeout
Merge origin/master
updating port dispatcher