Merge pull request #13 from ARTFL-Project/master

Update downstream
fix indentation error
Merge pull request #90 from clovis/master

update upstream