Merge pull request #19 from ARTFL-Project/master

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

Update downstream
bug fixes
Merge pull request #106 from clovis/master

Update upstream