Huwshimi machine token

Made some changes and re-pr.

The old PR can be found here #224