bug 22, bug fix
Merge branch 'master' of https://github.com/TBFMX/eym

merge