Merge branch 'master' of https://github.com/damascoa/Hihia-1.0.git