Refactored and added extra test cases
Releasing version 0.0.2