Fix warnings
Merge pull request #51 from z2v/version1.1

Fix code warnings