Merge branch 'release/1.0'
Hotfooting a few things
Merge branch 'hotfix/v1.0' into develop