Added some functions for reading the database
Merge remote-tracking branch 'origin/master'