Merge branches iss62/iss63 into develop

incorporates issue #62 and issue #63 into develop, along with the
cleanup of some old dead comments