Updating dev branch

Dev branch update.