Merge pull request #1 from simdugas/rickey

Update db.py
requires unique ID
Merge pull request #2 from simdugas/simon

requires unique ID