Fix compiler warnings
Merge pull request #89 from asmaloney/fix_compiler_warnings

Fix compiler warnings