Revert "Revert "Merge pull request #11 from alexrj/patch-1""

This reverts commit a1db2174b64b3ee7713966640d08fb44c110ca02.