modify hxlist to be much more smart
Merge remote-tracking branch 'origin/master'