Merge pull request #12 from ARTFL-Project/master

merge downstream
more parser fixes
Merge pull request #13 from ARTFL-Project/master

merge downstream
Merge pull request #177 from rwhaling/master

merge upstream, parser fixes