Merge pull request #16 from nealfennimore/neal/spec

Neal/spec
Better naming