Madalin, Alex - integrating master with slave, phase 1
Merge branch 'master' of https://github.com/cegeka/batchers