[BW]: [Fix] https://github.com/InvictusInnovations/keyhotee/issues/157
[BW]: [Fix] https://github.com/InvictusInnovations/keyhotee/issues/155
Merge branch 'master' of https://github.com/InvictusInnovations/keyhotee