Merge pull request #4 from orlandotm/master

Backport