added escaping for prefix
removed debug print statement
fixed handling of database command line arguments and optional port in database configuration
Merge branch 'master' into analysis