fixes merge table name
Merge branch 'issue#16' into issue#14
update
update
Merge branch 'issue#16' into issue#14
update