1.0.1

Refactoring