fixes
Merge branch 'develop' of https://github.com/HLFY/HLFY into develop