Pre merge commit
Merge branch 'master' into marc
Some cleaning
More cleaning
Final cleaning
Makefile added
Pre collision commit
Post collision. Everything went better than expected