more spec coverage you're welcome
Merge branch 'master' into spec