Merge Lynda's Search Branch with Master