Closed issue #30.
Also part of the issue #30 closure.