Merge pull request #27 from Ansuel/patch-1