Converted to C++. Minor Makefile changes