Merge pull request #2 from zioproto/master

Fix various compilation warnings