Refactor code
Release 0.3.3