handled local service protocol!
Merge branch 'master' into rest_services2
bugs fixed!