commit 11h20
Merge remote-tracking branch 'upstream/master'
commit 17h50
Merge pull request #5 from cllefebv/master

commit 17h57