Added support for index OR AND but get occasional SIGSEGV
Fixed alignment bug