Refactoring and bug fixing. Version++.