Merge pull request #30 from ARTFL-Project/master

Update dowstream
Merge pull request #154 from clovis/master

Merge pull request #30 from ARTFL-Project/master