Merge pull request #43 from ARTFL-Project/master

Update downstream
Merge pull request #235 from clovis/master

Merge pull request #43 from ARTFL-Project/master