Addresses #102