merging with master, fixed code review changes