v0.32

Refactoring