Updated make for features branch.