Changes according to issue #163
Merge pull request #166 from Saftophobia/Database

 Changes according to issue #163