Merge pull request #58 from PimV/Develop

Develop