Merge pull request #18 from ARTFL-Project/master

merge downstream
replaced zcat with gunzip in loader for Mac compatability
Merge pull request #233 from rwhaling/master

merge upstream