modifying sylvain
Some cleaning
Fixing conflicts
Merge pull request #16 from Pyke75/master

various fixes