v0.05

Refactoring