Small addition
Enable warnings
Fix compiler warnings
Merge branch 'master' into coverity_master