Updated Makefile
Removed pointless code.
Changed nonInteractive run to parse piped messages.