tests added
fixed selecting a single file
Merge remote-tracking branch 'origin/master'