Merge pull request #100 from tmcw/source-tags