Merge pull request #1 from mcostalba/master

Updating master