DRY up code
Bump version for release