Updated for phabricator without table layout
Merge pull request #6 from jingc/master

Updated for phabricator without table layout