Addresses #123