Merge pull request #21 from ARTFL-Project/master

Update downstream
massive fixes all around
Merge pull request #124 from clovis/master

Push fixes upstream