Pulling STD into main branch.

For obvious reasons, we want this branch to be in the master branch for completion of the project.

I request that its owner should finish up with its work and approve this merge.