Fix #188
Merge branch 'master' of https://github.com/ZeroK-RTS/Zero-K-Infrastructure