Merge branch 'release/v1.0.2'
Updates install controller

Replaces DS by / it was failing on windows installations
Merge branches 'master' and 'develop'
Merge branches 'develop' and 'master' into develop