HMB-89 Fix
HMB-87 fix
Merge branch 'master' of github.com:helpmebot/helpmebot