Merge pull request #121 from mat8913/master

Fix build on gcc