bump version, refactoring and testing