mpierrejean Merge pull request #11 from mpierrejean/develop