[GS] [Fix] #272

Merge branch 'master' of https://github.com/InvictusInnovations/keyhotee
Merge branch 'master' of https://github.com/InvictusInnovations/keyhotee