Fix for GCC 4.8

Conflicts:
	Makefile