Merge pull request #16 from tabassassin/retab/pr/1298

Retab/pr/1298