all from develop to master

manual commit because of problems with pull request
once more