Issue #74
Issue #76
Issue #77
Issue #78