Issue #56 - Igor's fix + refactor
Merge pull request #2 from jbatte47/feature/issue-56

Issue #56 - Igor's fix + refactor