Merge branch 'adasko' into bartek with corrections