merged master's style changes