Merge pull request #29 from TeXhackse/marei-reimplement-table