Merge pull request #786 from nZEDb/master

Master to Dev