Fixed database builder
Merge pull request #11 from krruzic/master

Fixed database builder.

Testing OP.