Updates after incorporating merge request #41