Refactored everything
Merge pull request #6 from tinganho/issue-4

Refactored everything - Fixes #4