Merge pull request #158 from olerem/gcc-9