Version for merge. Hopefully do not conflict with other branches

Signed-off-by: tianyuli <tli@wpi.edu>