Hotfix for issue #123 : Added Tail

Merging hotfix 123 to Dev