Issues #51-53 and #61