bug fix
Merge branch 'master' of ssh://github.com/teodormacicas/ERS-testing-tool