refactored a bit and bumped version to 0.0.2
refactored a bit and bumped version to 0.0.2