Minor changes for gcc compatability
Merge branch 'master' of https://github.com/VadimSokolov/polaris_io