minor changes
add multi-columns support(more than 2)