Addresses #62 and #46