Closes #241, #242