Update package
Refactor
Release 0.5.0