logic GuardClause
merge origin/rails4