Merge pull request #1 from fernandoRigo/master

update