Addresses #139