Merge pull request #22 from jennjwu/dev_jenn

remove conflict remains