Updated to revisions in master