dbpath fixed
cleanup
Merge branch 'feature/command-line' into develop