updates
Merge branch 'master' of github.com:shizukesa/config-perelandra

merge