sobrinho Merge pull request #599 from refile/fix-specs