(fix) modify client routing
Merge pull request #64 from jonsadka/fix/clientroutes

(fix) modify client routing