A new approach issue #6
Issue #6
Merge pull request #16 from ciberch/issue_6

Issue 6 - tests fixed