Merge pull request #299 from Fist0urs/Keepass