Fix and addition.
Merge pull request #133 from nZEDb/dev

Fix and addition.