Fix build with gcc 5.0.0

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>
Signed-off-by: Chet Kener <Cl3Kener@gmail.com>

Conflicts:
	Makefile