v0.1.8 => Added unit tests, refactored code and updated README