Fixes to compile with stricter g++-4.9 checks
Merge pull request #21 from keithw/g++-4.9-fixes

Fixes to compile with stricter g++-4.9 checks