Merge pull request #15 from davisp/fix-compiler-warning-gcc-5.1

Fix compiler warning on GCC 5.1.0