Merge pull request #56 from robmen/binder-database-refactor

Binder database refactor