Merging
Signed-off-by: Hui Zheng <hzheng@wpi.edu>