Merge pull request #1 from bcaffo/master

sync with source repo