Update to bleeding edge

If I'm correct, this is how I make a pull request to update my bleeding edge to the current one.  If this is an attempt to merge my old code to the uptodate bleeding edge, I've done something wrong and this should be closed and forgotten about, and I apologize for the inconvenience.