Remove compiler warnings
Merge pull request #598 from varunbpatil/compiler_warnings

Remove compiler warnings