Few changes.
Merge pull request #333 from nZEDb/dev

Few changes.