Manually merged #71 (MainForm.cs)

Completely closed #71.