Merge pull request #22 from SupunS/master

File validation modified
Merge remote-tracking branch 'upstream/master'