Merge https://github.com/mufleeh/tdr into site

Conflicts:
	test1.txt