HK stuff working
Merge branch 'master' of https://github.com/pinheadmz/EZ-XCP