fixed #402
Merge branch 'master' of https://github.com/nforge/yobi