new convention.

M
Merge branch 'master' of https://github.com/capi5k/capi5k