Issue #121: Refactored.