Add haystack support
Merge branch 'master' into demo