Addresses #130