Merge pull request #7 from davidcordon/feature/12

ADD feature/12
IMPLEMENT line 3
Merge pull request #8 from davidcordon/bug/5

FIX ISSUE 5