Revert "Merge branch 'master' of https://github.com/Luphia/Kamato"

This reverts commit 76c59caca52f4afa21a55a3827ec0db867f9e137, reversing
changes made to 2ec57b757938a56ce7dc7e075ff52cf54fcf19ef.
Revert "Revert "Merge branch 'master' of https://github.com/Luphia/Kamato""

This reverts commit 6191826ebb89ebdc409160005f0a5790979f73fd.