Merge pull request #612 from nZEDb/master

updating dev to master