Adding other items
Merge branch 'master' of https://github.com/michi-oshima/sandbox
some fixes and renaming