Make empty needle return haystack
Fix building version = Simple
Improve comments, rename var