incorporate our local patch

33f4fe271ac44d1161043547cf33cc4b3fb471fe
respect hier(7)
Merge pull request #302 from reallyenglish/10_1_tomoyukis

merge our local patches