Merged lookup branch into master.