Merge pull request #2 from dalibo/master

rebase