Merge pull request #3 from hpcugent/develop

Develop