unbreaking the build. again
Merge branch 'master' of https://github.com/HiveKa/HiveKa