Fixed linking error in Makefile
Merge branch 'mmallad-master'