Merge pull request #37 from clovis/master

Fixes
Merge pull request #38 from clovis/master

More bug fixes
Merge pull request #39 from clovis/master

More bug fixes
Merge pull request #8 from ARTFL-Project/master

Update downstream