Add support for GCC 4.8 & 4.9