Correcting wrong path
Adding remove in makefile
Merge branch 'master' into create_media_dir

Important update in master