Merge branch 'release/greenupapi_4' into develop
Merge branch 'master' into develop
Merge pull request #143 from EJEHardenberg/develop

Release version 3