Hotfix for issue #123 : Added Tail