Merge pull request #2 from nZEDb/dev

nzedb to jonnyboy