added changes by bblanchon
fixed a few bugs
forgot this
Merge pull request #120 from nZEDb/dev

jdev to ddev