Merge pull request #2 from SPAstef/master

We can merge it