Updated Units.h and Units.cpp and makefile