Merge pull request #20 from guozhaonan/master

Fb stuff to look at
most recent pull request