Merge pull request #55 from xiangli-cmu/master

Update
fix test