Addresses #117 & #126