first commit
Merge https://github.com/siozosdr/sokrastest