Merge pull request #1 from lhasbrou/master

test commit