Refactoring.
Bumped version.