Updated code to reflect version 1.0.0.beta release