test
add all
Fix merge conflict
test
Merge pull request #24 from djojo/master

geoffroy