Closing Issue #24