Merge pull request #596 from nZEDb/dev

Dev
Merge branch 'DariusIII-dev_test' into dev
Merge pull request #598 from nZEDb/dev

Dev
Merge pull request #599 from DariusIII/dev

Dev