Merge pull request #65 from Ha99y:mobile-them-HR-fix2