Merge pull request #39 from bxl1989/master

logic jar
merge update
Merge pull request #27 from roselone/master

mediator update