tsoko version
Merge branch 'master' into roko

Conflicts:
	README.txt