Fixed issue #93, search() changed