Closing Issue #29