Issue #23 and #24