Merge pull request #14 from ARTFL-Project/master

merge downstream