v0.5

Refactoring