hmod init
Merge hmod/master