Resolves issue #41.