What I have so far
Merge pull request #5 from jonatan-l/patch-5

What I have so far