Merge pull request #123 from mamarley/initdbfix