Fix issues
Merge branch 'develop' of hitc14.hendrikx-itc.nl:Minerva/python/minerva into develop