Merge pull request #33 from nordquant/tags