Merge pull request #1 from bcaffo/master

Update from original