Specs for user and helper for specs
Merge remote-tracking branch 'origin/master'