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