Using is_file instead of file_exists
Merge branch 'ffd114-master'