Update setup and fix readme
Bump version 2.5