My changes
Updated line edited by master
Merge branch 'master' into mywork

Conflicts:
	run.bat
Merge pull request #1 from fieryorc/mywork

Accepted pull request. 

My changes