Refactored methods to reduce complexity
Bump version number to 0.1.3