Addresses #109