Merge pull request #4 from eurojulien/bobiquette

Bobiquette
Merge pull request #7 from eurojulien/bruno

Merged by Bruno & Julien
Merge branch 'master' into bobiquette