Merge pull request #500 from fbobraga/master