Resolves Issue #229 (w/o doc, tests)
Resolves Issues #225, #229, and #274