Merge branch 'master' into trostik-alex1
base lookat methode