bug fix
Merge branch 'develop' of https://github.com/ers-devs/ers into develop