Merge pull request #786 from nZEDb/master

Master to Dev
Merge pull request #787 from nZEDb/dev

Merge pull request #786 from nZEDb/master