Fixes malformed table
Merge pull request #1201 in master
Merge pull request #1199
Merge pull request #1199 in develop