Fixing setup command
Merge branch 'dev'