Intermediate commit just to push everything safe.
Merge branch 'master' of https://github.com/ariran/pbdb