Manually merged #71 (Program.cs)