Version 2.0 2019.07.09
Cosmetic changes