Merge pull request #828 from narfbg/develop-trackback

Improve the Trackback library