Merge pull request #1 from alexames/master

Sync