merging dev into master, continue changes from master branch