Few minor changes.
Merge pull request #13 from nZEDb/dev

Few minor changes.