merged
kll/htcmap with  jediknight/htcmap