Issue #22. Minor changes.