Fixes after merge

Running version after merging with develop branch