Merge pull request #735 from leider/master

db name is now configurable