[GS] [Fix] #377
Merge branch 'master' of https://github.com/InvictusInnovations/keyhotee