key protocol added
stream fixes
Merge branch 'master' of orion.local:git/local/ucommon
formatting