Issue #13: Continued development.