Merge pull request #736 from marcelloc/master