Fixed setup
Fixed versioning