Using read_if_file in more controller methods
Merge remote-tracking branch 'origin/master'