mulitthreading implemented, query parsers added
merge server