Merge pull request #4 from orlandotm/master

Backport
Merge pull request #18 from ripaclub/master

Merge pull request #4 from orlandotm/master