fix bug [2]
Merge branch 'master' of https://github.com/akouryy/hawaii