Issue #43 - Implemented; needs testing
Issue #44 - Implemented; needs testing