Addresses #118