Small refactor, error message wording, add specs
Bump to 0.2.4