fixes merge table name
Merge branch 'issue#16' into issue#15