Merge pull request #9 from nZEDb/dev

Few changes.