Develop to Master

As stable and accurate as it's ever been, may as well merge