works on #27
Merge pull request #31 from natebrennand/spec

spec changes