fix compilation in gcc
fix tests for gcc
Merge pull request #1 from mek-x/fix_gcc

Fix gcc