Merge pull request #139 from olerem/gcc-7