Merge pull request #22 from roignac/master

Make things run