new branch v0.7.x
fixing setup issues