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