Merge pull request #17 from ARTFL-Project/master

merge clovis back
updated fix_drama script
Merge pull request #198 from clovis/master

Bug fixes
fixed quote values in Query
Merge pull request #200 from rwhaling/master

merge upstream
Merge pull request #39 from ARTFL-Project/master

Update downstream