at the fni dir
Merge branch 'master' of https://github.com/msyk/INTER-Mediator
Some functions were changed