copy changes from master
merging with new version