Merge branch 'feature/Setup-Environment' into develop
Merge pull request #2 from RobinMalfait/develop

Merge branch 'feature/Setup-Environment' into develop