Merge pull request #1 from mitya57/master

Fix compilation with GCC