changes from fb side
Merge pull request #13 from facebook/sync

changes from fb side