Development - Merge Issue #19 with basic search support