See github for changes
Merge branch 'feature/newFileHandling' into develop