encode authid and authtoken
fixes
propegate
Merge pull request #1 from sfraim/master

Fixes