distinguish companion hike
Merge branch 'master' of https://github.com/poko/IH
Merge branch 'master' of https://github.com/poko/IH