Version 3.0 2020.03.24
General modifications