Merge pull request #45 from shenki/warning-fixes

Warning fixes