minor code improvements
Change license EUPL into EUPL-1.2 for compatibility with SPDX license identifiers
Create version 2.0.0