Fixed merge to master