0.2.2 Code refactor and better documentation