Merge pull request #4 from HexSoftware/master

Updating My Fork
Merge pull request #5 from HexSoftware/master

ADF
cleaned up qdb tdb integration
Merge pull request #111 from nnordhof/master

Cleaned up qdb-tdb integration