Version 2, Beta-1

This adds the last few weeks of bug fixes and tweaks to the master code. The final release is schedule for July 27th, 2018.