Few fixes.
Merge pull request #411 from nZEDb/dev

Few fixes.