Merge pull request #65 from branan/spec_fix