updated
Merge branch 'master' of https://kelidas@github.com/kelidas/scratch.git