Merge pull request #28 from twiniars/master

critical hi fix
names changes
names changes
hi fix