Merge pull request #282 from Fist0urs/Keepass