Build: Fix
Merge branch 'master' of https://github.com/msemenistyi/hurri
Merge branch 'development' of https://github.com/msemenistyi/hurri into development