Refs #360. Updated docs and makefile.
Refs #360. Eliminated some code repetition with some constants.