Some fixes for gcc with strict options
Merge pull request #1 from unera/master

Some fixes for gcc with strict options