Issue #27 and #30