fixes #2

Merge branch 'beta'

Conflicts:
	tdcski.exe