Code refactor
Merge pull request #12 from malakasilva/master

Code refactor