Merge pull request #1 from eddiemachado/master

Sync with upstream