Added patch following recommendations from @mherchel. Also attached the scree...