Timothée Poisot Merge pull request #29 from mangal-wg/dev