Addresses #119