Corrected spec. Closes #29