Commit from repo1
Merge Commit
komit
v34
tsoko version
Merge branch 'master' into roko

Conflicts:
	README.txt