Hamogu update

This is the update that @hamogu pushed, now as a pull request.