Merge pull request #1 from bcaffo/master

update