Added initial database support.
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from cg-/master

Added database support.