Adding jak kod
Merging master to testing