commit 2
Merge pull request #20 from sulpice92/master

commit 2