Merge pull request #14 from ARTFL-Project/master

merge downstream
Merge pull request #182 from rwhaling/master

Merge pull request #14 from ARTFL-Project/master