Commiting the chnages resulting form the makefile modification in 8916af4