Repo Merge: Modified makefile for the soft sensor manager