Merge pull request #176 from elopio/patch-1