Fix merge
Make -p option required
Fix #41
Remove unused test
Fix #38
Fix asserts
Fix #36
Fix --db default value.
Fix #40
Merge pull request #44 from nephila/feature/misc_fixes

Feature/misc fixes