Merge branch 'bartek2' into bartek