add tim detail
Merge branch 'master' into kai

Conflicts:
	pysdocument.txt