Completes enhancement #53.
Corrects bug #92.
Corrects bug #62.