Merge pull request #2 from romaincheminade/master

Update from original