-- ok --
Merge branch 'master' of github.com:ChinaXing/HiD