Merge pull request #6 from shenki/warning-fixes

Warning fixes