fix with new master
removing some warnings
warnings again
warnings again
warnings again
Merge pull request #170 from kerautret/fixFromNewMaster

Fix from new master and some warnings