modified hulaki
Merge branch 'master' of https://github.com/Zazzercode/hulaki