Merge pull request #66 from ARTFL-Project/master

Update downstream
bug fixes
remove overwrite
Merge pull request #306 from clovis/master

Bug fixes