Merge pull request #1 from mastfish/dev

Dev
fixes for db location
Merge branch 'master' into dev