Issue #72
Issue #68
Issue #73