More additions.
Merge pull request #136 from nZEDb/dev

More additions.