Switched specs so that descriptions match code
Merge pull request #63 from severin/master

Spec "fix"/cleanup