Merge remote-tracking branch 'origin/release' into alpha
Update setup and fix readme
Bump version 2.5
Merge remote-tracking branch 'origin/alpha' into release