Fix build warnings and errors
Merge pull request #78 from GuillaumeGomez/master

Fix build warnings and errors