checking if file is valid
Merge remote-tracking branch 'origin/master'