remove h method, break character "'"
Merge remote-tracking branch 'upstream/master'