Fix warnings and tests
Merge pull request #72 from plaprade/master

Fix warnings and tests