Merge pull request #25 from ARTFL-Project/master

Minor fixes