Merge pull request #34 from ARTFL-Project/master

Update downstream
Merge pull request #185 from clovis/master

Merge pull request #34 from ARTFL-Project/master