Merge branch 'master' of https://github.com/ninjabong/xc-custom