modified a again
Merge branch 'master' into develop
verifies that tag does not already exists. Final touches