Bug fix + added initdb as a command line option