add table elements
Merge branch 'develop'