merging improved khanna
modified makefile to work with both algorithms