Merge pull request #25 from ARTFL-Project/master

Minor fixes
Merge pull request #143 from clovis/master

Merge pull request #25 from ARTFL-Project/master