Implementation of Issue #166

This PR addresses #166.