Merge pull request #1724 from luizluca/sane