Fix setup script
Merge remote-tracking branch 'origin/development' into HEAD
fix imports