Merge pull request #7 from clovis/master

Push changes to head
Merge pull request #8 from clovis/master

Bug fixes
Reinstate lost function during our merge
Merge pull request #4 from ARTFL-Project/master

update branch