Merge with github
Merge branch 'master' of github-unile:mai12lhv/hr3