hok: 1.3.8; closes #111

Include changes in 01e793b