Prep for v1.0 and beta version