Addresses #78 & #79