Fix/hack table formatters
Fix mistake
Merge branch 'master2'