Revert "Revert "Merge pull request #147 from florianv/table-options""

This reverts commit e342ff4483f0d2f8d620ef4c17b0b215fcab9e39.
Merge pull request #148 from bnisevic/develop

Revert "Revert "Merge pull request #147 from florianv/table-options""