Merge pull request #118 from shenki/gcc5-build-fixes

GCC 5 build fixes