Fix gcc warnings
Merge pull request #4 from nobrowser/for-upstream-merge

Fix gcc warnings