Add GCC 4.8.x compatibility

Conflicts:
	Makefile
Add GCC 4.8.x compatibility

Conflicts:
	Makefile
Add GCC 4.8.x compatibility

Conflicts:
	Makefile