Merge pull request #13 from msimonin/testing

Testing