Merge branch 'master' of https://github.com/c-concat-p/spritewerk