Merge pull request #673 from deferraz/master