Issue #28, #29, #30, #31, #32