minor changes
Merge remote-tracking branch 'Chekcers/master'
name changes
filename change in MakeFile and filename changes