Fixed gcc support (tentative)
Fixed travis-ci build (tentative)