Started GitHib issue #58 and #59.
Fixed GitHub issue/defect #60.
Fixed GitHub issue/enhancement #63.
Reformat code.