Merge pull request #39 from msimonin/testing

closes #37