Implements issue #1.