funkcnost ready
Merge origin/TomasDev into TomasDev