Refactoring
Bump version