Issues with adding rows to the table.... Not resolved
Merge origin/master