Issue #113, Issue #115, Issue #116