Bump version.
Some code refactoring.