Dev.
Merge pull request #492 from nZEDb/dev

Dev.