Change some helper method
Merge branch 'master' into active_admin