commit-mediator
Merge pull request #42 from bxl1989/master

mediator update: string map 2-2
Merge pull request #18 from roselone/master

update 5