0.5.1

Refactoring