#4: Search: Changing search to be more robust
merged #5, cleaned up code styles a bit
Merge branch 'making_search_more_configurable'
version bump