Refactor code
Release 0.1.9