Version 2.0

Some minor improvements and corrections.
Expanded for z/OS (thanks to Ricky Wu, see #2685)