Features/issue 372

Addresses issue #372.