Code refactoring
Bumping to 0.4.6