updating master for merge with localsearch branch