master -> datastruct

Master is the new head with both doc and datastruct.