Issue #56 - refactor and feature upgrade
Merge pull request #3 from jbatte47/feature/issue-56

Issue #56 - refactor and feature upgrade