[BACKLOG-207] - Refactoring and unit testing
Merge pull request #6 from brosander/master

[BACKLOG-207] - Refactoring and unit testing