Merge pull request #102 from clovis/master

Push fixes upstream
stupid bug fix in BufferedParser
Merge pull request #103 from rwhaling/master

stupid bug fix in BufferedParser
Merge pull request #19 from ARTFL-Project/master

Update downstream