merged with mingfang
Signed-off-by:Matthew Scaperoth <mscapero@gwu.edu>