Merge branch 'mycustom' of https://github.com/miahmie/krkrz into mycustom