Merge pull request #136 from hunner/change_specs