Merge pull request #914 from nZEDb/master

Master to dev
merging master back to dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge pull request #915 from nZEDb/dev

Dev