More adds.
Merge pull request #461 from nZEDb/dev

More adds.