Issue #24 improvements