#280 Style of table
Merge origin/master