hi fix'es
Merge pull request #81 from twiniars/master

hi fix'es