Merge cbrightsci fork into main project.

@cbrightsci I think your VS tab/space settings are off--these tabs look huge. Can you reformat with 2-space tabs going forward?