Merge pull request #14 from ARTFL-Project/master

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

Update downstream
Loader rewrite
Merge pull request #94 from clovis/master

update upstream