refactor
merge and refactor
merge master
Merge pull request #30 from xiangli-cmu/dev

refactor