Merge branch 'master' of https://github.com/oh-wo/SLM

Conflicts:
	WindowsFormsApplication1/WindowsFormsApplication1/Form1.cs