hotfix added
another fix
third fix
Merge branch 'master', remote-tracking branch 'zeta-hyf/master'