Finished polish; merging to master