Merge pull request #27 from ARTFL-Project/master

Merge upstream changes
fix imports
Merge pull request #148 from clovis/master

Fix imports