Changed hii into what trying to make a conflict
Merge pull request #2 from umyta/master

Changed hii into what trying to make a conflict