first commit
Merge https://github.com/santoine/eguire