merging changes in master back to develop branch