Closes #14
Merge branch 'whdb'