Revert "Revert "Merge pull request #2 from mabaroa/my_new_branch""

This reverts commit 050cb910bd15e9f51c31ca73c86d951c6b5e9862.