Merge pull request #78 from jeenuv:tf-issues-148