Merge pull request #59 from graimundo/master

[CLEANUP] - Refactored and added Unit tests