Merge pull request #1 from colombbus/master

Import
Update .gitignore
Merge pull request #1 from tangaratest/master

François integration commits