Merge with master and some changes