Addresses #50