Revert "Revert "Merge pull request #3 from camilo/master""

This reverts commit 2a36d64977a9bb7d257172450ab02e97ae967c52.