added haystack
merge master