Issue #30 and Issue #31