Version 2.0 2019.04.13
- Minor improvements