Merging Robert's Beta change into the master branch