tempiki
Merge branch 'master' into mikolaj