Bring updated code to master