Merge pull request #8 from ARTFL-Project/master

Update downstream
Merge pull request #9 from ARTFL-Project/master

update branch
many fixes
Merge pull request #43 from clovis/master

update upstream