Addresses Issue #121