Merge pull request #612 from nZEDb/master

updating dev to master
Merge pull request #613 from nZEDb/dev

Merge pull request #612 from nZEDb/master