Refactor
Release 0.1.1