Merge pull request #595 from bdellegrazie/windows-key-fix

Windows key fix
Merge branch 'master' into stable