Merge pull request #14 from JonCooperWorks/queries

Fixed autopopulate
Merge branch 'master' of github.com:JonCooperWorks/database
small cleanup.
Merge pull request #16 from JonCooperWorks/cleannn

Cleannn