[#023] Small refactoring
[#029] Updated readme for v0.0.2