Merge pull request #16 from ARTFL-Project/master

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

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

Update downstream
bug fixes
bug fixes in various places
Merge pull request #102 from clovis/master

Push fixes upstream