Merge pull request #291 from Crypto-Expert/master

Merge with Master DB Changes