Merge pull request #36 from yjbanov/master

Move proxy to runtime. Fix error handling bug in multiplexer.