Handlers fix
Merge branch 'master' of https://github.com/miller-hacks/huigma