Updated for total hks
Merge branch 'master' of https://github.com/lanuigi/HK-Tracker