Issue #89

Implemented.