merged the master branch to the azhdev branch