Database modified
Merge pull request #57 from olavin/develop

Database modified