Fix for different scenario of issue 131(came up after Issue #166 is fixed)
Merge branch 'master' of https://github.com/InvictusInnovations/keyhotee