Merge pull request #31 from ARTFL-Project/master

Update dowstream
Merge pull request #164 from clovis/master

Merge pull request #31 from ARTFL-Project/master