Fixed merge with master