[GS] [Fix] #170
undone 3f6d54d84f9fda724d78e4a38e9305b6ac85c93f because #51
Merge branch 'master' of https://github.com/InvictusInnovations/keyhotee