some fixs
Merge branch 'master' of https://github.com/yohav/2Help