Merge pull request #80 from twiniars/master

hi fix
hi fix'es